From c1cc94b08bef8437b8b8f9a1d1048e8fdc308308 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 May 2019 20:17:15 -0400 Subject: [PATCH] cell renderer toggle: Make final --- gtk/gtkcellrenderertoggle.c | 19 +++++++++++++++++++ gtk/gtkcellrenderertoggle.h | 28 +--------------------------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index f79b97e2d4..b1f6fc0b69 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -90,6 +90,25 @@ enum { static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; +typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; +typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass; + +struct _GtkCellRendererToggle +{ + GtkCellRenderer parent; + + /*< private >*/ + GtkCellRendererTogglePrivate *priv; +}; + +struct _GtkCellRendererToggleClass +{ + GtkCellRendererClass parent_class; + + void (* toggled) (GtkCellRendererToggle *cell, + const char *path); +}; + struct _GtkCellRendererTogglePrivate { guint active : 1; diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h index 5d022fa5c9..83575b352c 100644 --- a/gtk/gtkcellrenderertoggle.h +++ b/gtk/gtkcellrenderertoggle.h @@ -30,36 +30,10 @@ G_BEGIN_DECLS #define GTK_TYPE_CELL_RENDERER_TOGGLE (gtk_cell_renderer_toggle_get_type ()) #define GTK_CELL_RENDERER_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggle)) -#define GTK_CELL_RENDERER_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass)) #define GTK_IS_CELL_RENDERER_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE)) -#define GTK_IS_CELL_RENDERER_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE)) -#define GTK_CELL_RENDERER_TOGGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass)) typedef struct _GtkCellRendererToggle GtkCellRendererToggle; -typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; -typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass; - -struct _GtkCellRendererToggle -{ - GtkCellRenderer parent; - - /*< private >*/ - GtkCellRendererTogglePrivate *priv; -}; - -struct _GtkCellRendererToggleClass -{ - GtkCellRendererClass parent_class; - - void (* toggled) (GtkCellRendererToggle *cell_renderer_toggle, - const gchar *path); - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; + GDK_AVAILABLE_IN_ALL GType gtk_cell_renderer_toggle_get_type (void) G_GNUC_CONST; -- 2.30.2